Update to 1.5.2.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2594 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 18 insertions, 33 deletions

diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index b698f0f13..005d8b2fe 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pango
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.5,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.3/
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index ccc608630..f87be49ed 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/pango-1.5.1.tar.bz2) = c11cf17c6af0b8f756627516fedb567c
-SIZE (gnome2/pango-1.5.1.tar.bz2) = 945714
+MD5 (gnome2/pango-1.5.2.tar.bz2) = c171825dfa40ddb36bdc00cc57f3a171
+SIZE (gnome2/pango-1.5.2.tar.bz2) = 948825
diff --git a/x11-toolkits/pango/files/patch-ac b/x11-toolkits/pango/files/patch-ac
index 170c0fe7d..8860904ea 100644
--- a/x11-toolkits/pango/files/patch-ac
+++ b/x11-toolkits/pango/files/patch-ac
@@ -1,14 +1,15 @@
 
 $FreeBSD: ports/x11-toolkits/pango/files/patch-ac,v 1.6 2004/04/05 03:11:39 marcus Exp $
 
---- Makefile.in.orig	Mon Mar 11 12:16:33 2002
-+++ Makefile.in	Mon Mar 11 12:24:58 2002
-@@ -116,7 +116,7 @@
- YACC = @YACC@
- ms_librarian = @ms_librarian@
+--- Makefile.in.orig	Mon Aug  2 19:12:56 2004
++++ Makefile.in	Mon Aug  2 19:13:11 2004
+@@ -234,7 +234,7 @@
+ 
+ AUTOMAKE_OPTIONS = 1.7
  
 -SUBDIRS = pango modules examples docs tools tests
 +SUBDIRS = pango modules examples docs tools
  
  EXTRA_DIST = \
- 	pango.spec.in	\
+ 	pango.pc.in	\
+
diff --git a/x11-toolkits/pango/files/patch-configure b/x11-toolkits/pango/files/patch-configure
index 611bcc576..76a6d1eef 100644
--- a/x11-toolkits/pango/files/patch-configure
+++ b/x11-toolkits/pango/files/patch-configure
@@ -1,7 +1,7 @@
---- configure.orig	Thu Jun 13 17:04:03 2002
-+++ configure	Wed Jul  3 12:46:50 2002
-@@ -12084,10 +12085,10 @@
- s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+--- configure.orig	Mon Aug  2 19:13:53 2004
++++ configure	Mon Aug  2 19:14:46 2004
+@@ -23948,10 +23948,10 @@
+ s,@CYGPATH_W@,$CYGPATH_W,;t t
  s,@PACKAGE@,$PACKAGE,;t t
  s,@VERSION@,$VERSION,;t t
 -s,@ACLOCAL@,$ACLOCAL,;t t
@@ -13,5 +13,5 @@
 +s,@AUTOMAKE@,/usr/bin/true,;t t
 +s,@AUTOHEADER@,/usr/bin/true,;t t
  s,@MAKEINFO@,$MAKEINFO,;t t
- s,@SET_MAKE@,$SET_MAKE,;t t
- s,@CC@,$CC,;t t
+ s,@AMTAR@,$AMTAR,;t t
+ s,@install_sh@,$install_sh,;t t
diff --git a/x11-toolkits/pango/files/patch-examples_renderdemo.c b/x11-toolkits/pango/files/patch-examples_renderdemo.c
deleted file mode 100644
index e1b70cb3c..000000000
--- a/x11-toolkits/pango/files/patch-examples_renderdemo.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- examples/renderdemo.c.orig	Mon Jul 19 20:53:12 2004
-+++ examples/renderdemo.c	Mon Jul 19 20:53:28 2004
-@@ -306,11 +306,12 @@
- 		gpointer    data)
- {
-   static GEnumClass *class = NULL;
-+  GEnumValue *value;
- 
-   if (!class)
-     class = g_type_class_ref (PANGO_TYPE_ELLIPSIZE_MODE);
-   
--  GEnumValue *value = g_enum_get_value_by_nick (class, arg);
-+  value = g_enum_get_value_by_nick (class, arg);
-   if (!value)
-     fail ("--ellipsize option must be one of none/start/middle/end");
- 
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index 508ecedb6..a840b8125 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -5,7 +5,6 @@ include/pango-1.0/pango/pango-attributes.h
 include/pango-1.0/pango/pango-break.h
 include/pango-1.0/pango/pango-context.h
 include/pango-1.0/pango/pango-coverage.h
-include/pango-1.0/pango/pangofc-decoder.h
 include/pango-1.0/pango/pango-engine.h
 include/pango-1.0/pango/pango-enum-types.h
 include/pango-1.0/pango/pango-font.h
@@ -22,6 +21,7 @@ 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-decoder.h
 include/pango-1.0/pango/pangofc-font.h
 include/pango-1.0/pango/pangofc-fontmap.h
 include/pango-1.0/pango/pangoft2.h
@@ -55,6 +55,7 @@ libdata/pkgconfig/pangoxft.pc
 %%DOCSDIR%%/PangoFcDecoder.html
 %%DOCSDIR%%/PangoFcFont.html
 %%DOCSDIR%%/PangoFcFontMap.html
+%%DOCSDIR%%/PangoMarkupFormat.html
 %%DOCSDIR%%/home.png
 %%DOCSDIR%%/index.html
 %%DOCSDIR%%/index.sgml
@@ -62,7 +63,6 @@ libdata/pkgconfig/pangoxft.pc
 %%DOCSDIR%%/layout.gif
 %%DOCSDIR%%/left.png
 %%DOCSDIR%%/lowlevel.html
-%%DOCSDIR%%/PangoMarkupFormat.html
 %%DOCSDIR%%/pango-Coverage-Maps.html
 %%DOCSDIR%%/pango-Engines.html
 %%DOCSDIR%%/pango-Fonts.html