12 files changed, 37 insertions, 126 deletions

diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 7124c70c878b..5aae206ceffb 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	pango
-PORTVERSION=	1.2.5
-PORTREVISION=	2
+PORTVERSION=	1.4.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.2,} \
-		ftp://ftp.gtk.org/pub/gtk/v2.2/
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.4,} \
+		ftp://ftp.gtk.org/pub/gtk/v2.3/
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -33,7 +32,7 @@ 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
+# Hmm.. tough one.  Found this one when I had graphics/hdf installed
 # (which installs glist.h) which is picked up before the glib-2.0
 # stuff, with Bad Results[tm]
 #
@@ -42,11 +41,13 @@ 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"
+PLIST_SUB=	VERSION="1.4.0"
 
 FONTSCALE=	${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
 FONTENCOD=	${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc
 
+MAN1=		pango-querymodules.1
+
 post-patch:
 	@${FIND} ${WRKSRC}/pango/opentype -name "*.[ch]" | ${XARGS} \
 		${REINPLACE_CMD} -e 's|internal/tterrors\.h|fterrors.h| ; \
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index a6d34f66c3f8..91ee4b4a4267 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/pango-1.2.5.tar.bz2) = df00fe3e71cd297010f24f439b6c8ee6
-SIZE (gnome2/pango-1.2.5.tar.bz2) = 865495
+MD5 (gnome2/pango-1.4.0.tar.bz2) = 9b5d9a5dcce5b3899d401f9c2cd6873f
+SIZE (gnome2/pango-1.4.0.tar.bz2) = 921472
diff --git a/x11-toolkits/pango/files/patch-modules_indic_indic-ot.h b/x11-toolkits/pango/files/patch-modules_indic_indic-ot.h
deleted file mode 100644
index 9e6a2e4292d0..000000000000
--- a/x11-toolkits/pango/files/patch-modules_indic_indic-ot.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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"
diff --git a/x11-toolkits/pango/files/patch-pango_opentype_ftxopen.h b/x11-toolkits/pango/files/patch-pango_opentype_ftxopen.h
deleted file mode 100644
index 25a937a88ef1..000000000000
--- a/x11-toolkits/pango/files/patch-pango_opentype_ftxopen.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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" {
diff --git a/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-info.c b/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-info.c
deleted file mode 100644
index 0deb4b92e48c..000000000000
--- a/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-info.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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);
diff --git a/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-private.h b/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-private.h
deleted file mode 100644
index 0d2e0c944177..000000000000
--- a/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-private.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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>
- 
diff --git a/x11-toolkits/pango/files/patch-pango_pango-ot.h b/x11-toolkits/pango/files/patch-pango_pango-ot.h
deleted file mode 100644
index 61e68f7207e7..000000000000
--- a/x11-toolkits/pango/files/patch-pango_pango-ot.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
diff --git a/x11-toolkits/pango/files/patch-pango_pangoft2.c b/x11-toolkits/pango/files/patch-pango_pangoft2.c
deleted file mode 100644
index f1d05cd84dfd..000000000000
--- a/x11-toolkits/pango/files/patch-pango_pangoft2.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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"
diff --git a/x11-toolkits/pango/files/patch-pango_pangoft2.h b/x11-toolkits/pango/files/patch-pango_pangoft2.h
deleted file mode 100644
index af7dcded906f..000000000000
--- a/x11-toolkits/pango/files/patch-pango_pangoft2.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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>
- 
diff --git a/x11-toolkits/pango/files/pkg-install.in b/x11-toolkits/pango/files/pkg-install.in
index d734df0dddfc..2eefcdfcd015 100644
--- a/x11-toolkits/pango/files/pkg-install.in
+++ b/x11-toolkits/pango/files/pkg-install.in
@@ -3,7 +3,9 @@
 PATH=/bin:/usr/bin:/sbin:/usr/sbin:%%X11BASE%%/bin
 export PATH
 
-if [ "$2" = "POST-INSTALL" ]; then
+case $2 in
+POST-INSTALL)
     echo "Running fc-cache to build fontconfig cache..."
     fc-cache -f -v
-fi
+    ;;
+esac
diff --git a/x11-toolkits/pango/pkg-descr b/x11-toolkits/pango/pkg-descr
index 49eeb62d0df3..9ff793b51135 100644
--- a/x11-toolkits/pango/pkg-descr
+++ b/x11-toolkits/pango/pkg-descr
@@ -1,8 +1,6 @@
-The goal of the Pango project is to provide an open-source framework for the
-layout and rendering of internationalized text. Pango is an offshoot of the
-GTK+ and GNOME projects, and the initial focus is operation in those
-environments, however there is nothing fundamentally GTK+ or GNOME specific
-about Pango. Pango uses Unicode for all of its encoding, and will eventually
-support output in all the world's major languages. 
+Pango provides a framework to render and control the layout of
+internationalized text, and is the backend for right-to-left text.
+Pango is an integral part of the GTK+ and GNOME projects, but its
+code is platform- and toolkit-independent.
 
 WWW: http://www.pango.org/
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index 575d51a21f62..cbb44b3091ae 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -12,56 +12,47 @@ include/pango-1.0/pango/pango-fontmap.h
 include/pango-1.0/pango/pango-fontset.h
 include/pango-1.0/pango/pango-glyph-item.h
 include/pango-1.0/pango/pango-glyph.h
-include/pango-1.0/pango/pango-indic.h
 include/pango-1.0/pango/pango-item.h
 include/pango-1.0/pango/pango-layout.h
 include/pango-1.0/pango/pango-modules.h
 include/pango-1.0/pango/pango-ot.h
+include/pango-1.0/pango/pango-script.h
 include/pango-1.0/pango/pango-tabs.h
 include/pango-1.0/pango/pango-types.h
 include/pango-1.0/pango/pango-utils.h
 include/pango-1.0/pango/pango.h
+include/pango-1.0/pango/pangofc-font.h
+include/pango-1.0/pango/pangofc-fontmap.h
 include/pango-1.0/pango/pangoft2.h
 include/pango-1.0/pango/pangox.h
 include/pango-1.0/pango/pangoxft.h
 lib/libpango-1.0.a
 lib/libpango-1.0.so
-lib/libpango-1.0.so.200
+lib/libpango-1.0.so.399
 lib/libpangoft2-1.0.a
 lib/libpangoft2-1.0.so
-lib/libpangoft2-1.0.so.200
+lib/libpangoft2-1.0.so.399
 lib/libpangox-1.0.a
 lib/libpangox-1.0.so
-lib/libpangox-1.0.so.200
+lib/libpangox-1.0.so.399
 lib/libpangoxft-1.0.a
 lib/libpangoxft-1.0.so
-lib/libpangoxft-1.0.so.200
-lib/pango/%%VERSION%%/modules/pango-arabic-ft2.so
-lib/pango/%%VERSION%%/modules/pango-arabic-x.so
-lib/pango/%%VERSION%%/modules/pango-arabic-xft.so
-lib/pango/%%VERSION%%/modules/pango-basic-ft2.so
+lib/libpangoxft-1.0.so.399
+lib/pango/%%VERSION%%/modules/pango-arabic-fc.so
+lib/pango/%%VERSION%%/modules/pango-basic-fc.so
 lib/pango/%%VERSION%%/modules/pango-basic-x.so
-lib/pango/%%VERSION%%/modules/pango-basic-xft.so
-lib/pango/%%VERSION%%/modules/pango-bengali-x.so
-lib/pango/%%VERSION%%/modules/pango-devanagari-x.so
-lib/pango/%%VERSION%%/modules/pango-gujarati-x.so
-lib/pango/%%VERSION%%/modules/pango-gurmukhi-x.so
-lib/pango/%%VERSION%%/modules/pango-hangul-xft.so
-lib/pango/%%VERSION%%/modules/pango-hangul-x.so
-lib/pango/%%VERSION%%/modules/pango-hebrew-ft2.so
-lib/pango/%%VERSION%%/modules/pango-hebrew-x.so
-lib/pango/%%VERSION%%/modules/pango-hebrew-xft.so
-lib/pango/%%VERSION%%/modules/pango-indic-xft.so
-lib/pango/%%VERSION%%/modules/pango-indic-ft2.so
-lib/pango/%%VERSION%%/modules/pango-myanmar-x.so
-lib/pango/%%VERSION%%/modules/pango-tamil-x.so
-lib/pango/%%VERSION%%/modules/pango-thai-x.so
-lib/pango/%%VERSION%%/modules/pango-thai-xft.so
-lib/pango/%%VERSION%%/modules/pango-thai-ft2.so
+lib/pango/%%VERSION%%/modules/pango-hangul-fc.so
+lib/pango/%%VERSION%%/modules/pango-hebrew-fc.so
+lib/pango/%%VERSION%%/modules/pango-indic-fc.so
+lib/pango/%%VERSION%%/modules/pango-thai-fc.so
 libdata/pkgconfig/pango.pc
 libdata/pkgconfig/pangoft2.pc
 libdata/pkgconfig/pangox.pc
 libdata/pkgconfig/pangoxft.pc
+share/doc/pango/PangoEngineLang.html
+share/doc/pango/PangoEngineShape.html
+share/doc/pango/PangoFcFont.html
+share/doc/pango/PangoFcFontMap.html
 share/doc/pango/home.png
 share/doc/pango/index.html
 share/doc/pango/index.sgml
@@ -75,20 +66,22 @@ share/doc/pango/pango-Engines.html
 share/doc/pango/pango-Fonts.html
 share/doc/pango/pango-FreeType-Fonts-and-Rendering.html
 share/doc/pango/pango-Glyph-Storage.html
-share/doc/pango/pango-Indic-Engine-Support.html
 share/doc/pango/pango-Layout-Objects.html
 share/doc/pango/pango-Modules.html
 share/doc/pango/pango-OpenType-Font-Handling.html
+share/doc/pango/pango-Scripts.html
 share/doc/pango/pango-Tab-Stops.html
 share/doc/pango/pango-Text-Attributes.html
 share/doc/pango/pango-Text-Processing.html
 share/doc/pango/pango-Win32-Fonts-and-Rendering.html
 share/doc/pango/pango-X-Fonts-and-Rendering.html
 share/doc/pango/pango-Xft-Fonts-and-Rendering.html
+share/doc/pango/pango-querymodules.html
 share/doc/pango/pango.devhelp
 share/doc/pango/pango.html
 share/doc/pango/rendering.html
 share/doc/pango/right.png
+share/doc/pango/tools.html
 share/doc/pango/up.png
 @dirrm share/doc/pango
 @dirrm lib/pango/%%VERSION%%/modules