5 files changed, 81 insertions, 52 deletions

diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 8881a7ffa9e0..f8aee382933a 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pango
-PORTVERSION=	0.13
+PORTVERSION=	0.15
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/v1.3/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.3/ \
@@ -14,7 +14,11 @@ MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/v1.3/ \
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	glib-1.3.2:${PORTSDIR}/devel/glib13
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig \
+		freetype-config:${PORTSDIR}/print/freetype2	# XXX
+LIB_DEPENDS=	glib-1.3.4:${PORTSDIR}/devel/glib13 \
+		freetype.6:${PORTSDIR}/print/freetype2
+RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
@@ -23,4 +27,8 @@ CONFIGURE_ARGS=	--with-qt=no
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
+pre-patch:
+	@find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
+		's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index 5d8c8b93d138..42e4d06ce8ef 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1 +1 @@
-MD5 (pango-0.13.tar.gz) = 524bb245043d8b5b72feb3e8594968f5
+MD5 (pango-0.15.tar.gz) = 07b0e9c0f39f4bb66977ca7475aa3584
diff --git a/x11-toolkits/pango/files/patch-ab b/x11-toolkits/pango/files/patch-ab
index 1a7fc273320a..bb06901951a8 100644
--- a/x11-toolkits/pango/files/patch-ab
+++ b/x11-toolkits/pango/files/patch-ab
@@ -1,6 +1,9 @@
---- pango/Makefile.in.orig	Fri Nov 17 23:44:42 2000
-+++ pango/Makefile.in	Mon Nov 20 12:43:20 2000
-@@ -106,10 +106,10 @@
+
+$FreeBSD$
+
+--- pango/Makefile.in.orig	Sun Apr 29 14:22:28 2001
++++ pango/Makefile.in	Sun Apr 29 14:24:26 2001
+@@ -136,22 +136,22 @@
  # down at which point we'll either use the GTK+ versioning
  # scheme or the standard libtool scheme.
  #
@@ -10,6 +13,20 @@
  
 -libpangox_la_LDFLAGS = -release $(VERSION)
 +libpangox_la_LDFLAGS = -version-info $(VERSION:S/./:/)
- libpangox_la_LIBADD = $(INCLUDED_MODULES)
+ libpangox_la_LIBADD = $(X_LIBS) $(INCLUDED_X_MODULES)
+ libpangoxft_la_SOURCES =  	pangoxft-font.c			pangoxft-fontmap.c      	pangoxft-private.h		module-defs-xft.c
+ 
+ 
+ libpangoxft_la_LIBADD = $(INCLUDED_XFT_MODULES) $(XFT_LIBS) opentype/libpango-ot.la
+-libpangoxft_la_LDFLAGS = -release $(VERSION)
++libpangoxft_la_LDFLAGS = -version-info $(VERSION:S/./:/)
+ 
+ libpangoft2_la_SOURCES =  	pangoft2.h			pangoft2.c			pangoft2-private.h		pangoft2-fontcache.c		pangoft2-fontmap.c		module-defs-ft2.c
+ 
+ 
+ libpangoft2_la_LIBADD = $(INCLUDED_FT2_MODULES) $(FREETYPE_LIBS)
+-libpangoft2_la_LDFLAGS = -release $(VERSION)
++libpangoft2_la_LDFLAGS = -version-info $(VERSION:S/./:/)
+ 
+ pangoincludedir = $(includedir)/pango-1.0/pango
  
- pangoincludedir = $(includedir)/pango
diff --git a/x11-toolkits/pango/files/patch-ac b/x11-toolkits/pango/files/patch-ac
index f63bf7d85066..c9ffb09651b6 100644
--- a/x11-toolkits/pango/files/patch-ac
+++ b/x11-toolkits/pango/files/patch-ac
@@ -1,20 +1,14 @@
---- Makefile.in.orig	Fri Nov 17 23:44:38 2000
-+++ Makefile.in	Mon Nov 20 12:55:05 2000
-@@ -88,7 +88,7 @@
+
+$FreeBSD$
+
+--- Makefile.in	2001/04/29 11:31:14	1.1
++++ Makefile.in	2001/04/29 11:31:26
+@@ -94,7 +94,7 @@
  VERSION = @VERSION@
- X_LIBS = @X_LIBS@
+ XFT_LIBS = @XFT_LIBS@
  
--SUBDIRS = modules pango examples docs tools fonts
-+SUBDIRS = modules pango examples tools fonts
+-SUBDIRS = modules pango examples docs tools tests
++SUBDIRS = modules pango examples tools tests
  
- bin_SCRIPTS = pango-config
+ EXTRA_DIST =  	pango.spec.in		pango.pc.in		pangox.pc.in		pangoxft.pc.in		pangoft2.pc.in		TODO.xml		README.win32
  
-@@ -369,7 +369,7 @@
- install-exec-am: install-binSCRIPTS
- install-exec: install-exec-recursive
- 
--install-data-am: install-pkgconfigDATA
-+install-data-am: 
- install-data: install-data-recursive
- 
- install-am: all-am
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index a2041839f601..1d4da585d04f 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -1,40 +1,50 @@
-bin/pango-config
 bin/pango-querymodules
 etc/pango/pango.modules
 etc/pango/pangox.aliases
-include/pango/pango-attributes.h
-include/pango/pango-context.h
-include/pango/pango-coverage.h
-include/pango/pango-engine.h
-include/pango/pango-font.h
-include/pango/pango-fontmap.h
-include/pango/pango-glyph.h
-include/pango/pango-indic.h
-include/pango/pango-item.h
-include/pango/pango-layout.h
-include/pango/pango-modules.h
-include/pango/pango-tabs.h
-include/pango/pango-types.h
-include/pango/pango-utils.h
-include/pango/pango.h
-include/pango/pangox.h
+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/pango-engine.h
+include/pango-1.0/pango/pango-enum-types.h
+include/pango-1.0/pango/pango-font.h
+include/pango-1.0/pango/pango-fontmap.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-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/pangoft2.h
+include/pango-1.0/pango/pangox.h
 lib/libpango.a
 lib/libpango.so
 lib/libpango.so.0
+lib/libpangoft2.a
+lib/libpangoft2.so
+lib/libpangoft2.so.0
 lib/libpangox.a
 lib/libpangox.so
 lib/libpangox.so.0
-lib/pango/modules/pango-arabic.so
-lib/pango/modules/pango-basic.so
-lib/pango/modules/pango-bengali.so
-lib/pango/modules/pango-devanagari.so
-lib/pango/modules/pango-gujarati.so
-lib/pango/modules/pango-gurmukhi.so
-lib/pango/modules/pango-hangul.so
-lib/pango/modules/pango-myanmar.so
-lib/pango/modules/pango-tamil.so
-lib/pango/modules/pango-thai.so
+lib/pango/modules/pango-arabic-x.so
+lib/pango/modules/pango-basic-ft2.so
+lib/pango/modules/pango-basic-x.so
+lib/pango/modules/pango-bengali-x.so
+lib/pango/modules/pango-devanagari-x.so
+lib/pango/modules/pango-gujarati-x.so
+lib/pango/modules/pango-gurmukhi-x.so
+lib/pango/modules/pango-hangul-x.so
+lib/pango/modules/pango-myanmar-x.so
+lib/pango/modules/pango-tamil-x.so
+lib/pango/modules/pango-thai-x.so
+libdata/pkgconfig/pango.pc
+libdata/pkgconfig/pangoft2.pc
+libdata/pkgconfig/pangox.pc
 @dirrm lib/pango/modules
 @dirrm lib/pango
-@dirrm include/pango
+@dirrm include/pango-1.0/pango
+@dirrm include/pango-1.0
 @dirrm etc/pango