7 files changed, 79 insertions, 22 deletions

diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index b12cf423f3dc..0a56fec260dd 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pango
-PORTVERSION=	0.16
-PORTREVISION=	1
+PORTVERSION=	0.17
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/v1.3/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.3/ \
@@ -17,15 +16,13 @@ MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig \
 		freetype-config:${PORTSDIR}/print/freetype2	# XXX
-LIB_DEPENDS=	glib-1.3.5:${PORTSDIR}/devel/glib13 \
+LIB_DEPENDS=	glib-1.3.6:${PORTSDIR}/devel/glib13 \
 		freetype.7:${PORTSDIR}/print/freetype2
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
-BROKEN=		"uses some freetype2 internals and as a result was b0rken by freetype2 upgrade"
-
 USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-qt=no
 
 # Hmm.. tough one.  Found this one when I had graphics/hdf installed
@@ -33,7 +30,9 @@ CONFIGURE_ARGS=	--with-qt=no
 # stuff, with Bad Results[tm]
 #
 GLIB2_CFLAGS=	`pkg-config glib-2.0 --cflags`
-CONFIGURE_ENV=	CPPFLAGS="${GLIB2_CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
+			${GLIB2_CFLAGS} -I${LOCALBASE}/include \
+			-I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 .include <bsd.port.pre.mk>
@@ -47,5 +46,7 @@ PLIST_SUB+=	XFREE4:=""
 pre-patch:
 	@find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
 		's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
+	@find ${WRKSRC}/pango/opentype -name "*.[ch]" | xargs ${PERL} -pi -e \
+		's|internal/tterrors\.h|fterrors.h| ; s|TT_Err_|FT_Err_|g'
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index bcf3573cdb26..b66cb4429d60 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1 +1 @@
-MD5 (pango-0.16.tar.gz) = a0a2d84267aafa459a9a409bad30ac49
+MD5 (pango-0.17.tar.gz) = 2dd051d1a6274dd315e00ab4a86a5070
diff --git a/x11-toolkits/pango/files/patch-ab b/x11-toolkits/pango/files/patch-ab
index bb06901951a8..2504e79c34d2 100644
--- a/x11-toolkits/pango/files/patch-ab
+++ b/x11-toolkits/pango/files/patch-ab
@@ -1,9 +1,9 @@
 
 $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 @@
+--- pango/Makefile.in.orig	Wed Jul 18 15:23:42 2001
++++ pango/Makefile.in	Wed Jul 18 15:24:55 2001
+@@ -143,10 +143,10 @@
  # down at which point we'll either use the GTK+ versioning
  # scheme or the standard libtool scheme.
  #
@@ -13,20 +13,23 @@ $FreeBSD$
  
 -libpangox_la_LDFLAGS = -release $(VERSION)
 +libpangox_la_LDFLAGS = -version-info $(VERSION:S/./:/)
- libpangox_la_LIBADD = $(X_LIBS) $(INCLUDED_X_MODULES)
- libpangoxft_la_SOURCES =  	pangoxft-font.c			pangoxft-fontmap.c      	pangoxft-private.h		module-defs-xft.c
+ libpangox_la_LIBADD = $(INCLUDED_X_MODULES) $(X_LIBS) libpango.la
+ libpangox_la_DEPENDENCIES = $(INCLUDED_X_MODULES) libpango.la
  
+@@ -154,14 +154,14 @@
  
- libpangoxft_la_LIBADD = $(INCLUDED_XFT_MODULES) $(XFT_LIBS) opentype/libpango-ot.la
+ 
+ libpangoxft_la_LIBADD = $(INCLUDED_XFT_MODULES) $(XFT_LIBS) opentype/libpango-ot.la libpango.la
 -libpangoxft_la_LDFLAGS = -release $(VERSION)
 +libpangoxft_la_LDFLAGS = -version-info $(VERSION:S/./:/)
+ libpangoxft_la_DEPENDENCIES = $(INCLUDED_XFT_MODULES) libpango.la
  
  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_LIBADD = $(INCLUDED_FT2_MODULES) $(FREETYPE_LIBS) libpango.la
 -libpangoft2_la_LDFLAGS = -release $(VERSION)
 +libpangoft2_la_LDFLAGS = -version-info $(VERSION:S/./:/)
+ libpangoft2_la_DEPENDENCIES = $(INCLUDED_FT2_MODULES) libpango.la
  
  pangoincludedir = $(includedir)/pango-1.0/pango
- 
diff --git a/x11-toolkits/pango/files/patch-ac b/x11-toolkits/pango/files/patch-ac
index c9ffb09651b6..740dc9b2eb38 100644
--- a/x11-toolkits/pango/files/patch-ac
+++ b/x11-toolkits/pango/files/patch-ac
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- Makefile.in	2001/04/29 11:31:14	1.1
-+++ Makefile.in	2001/04/29 11:31:26
-@@ -94,7 +94,7 @@
+--- Makefile.in.orig	Wed Jul 18 15:25:57 2001
++++ Makefile.in	Wed Jul 18 15:26:20 2001
+@@ -101,7 +101,7 @@
  VERSION = @VERSION@
  XFT_LIBS = @XFT_LIBS@
  
--SUBDIRS = modules pango examples docs tools tests
-+SUBDIRS = modules pango examples tools tests
+-SUBDIRS = pango modules examples docs tools tests
++SUBDIRS = pango modules examples tools tests
  
- EXTRA_DIST =  	pango.spec.in		pango.pc.in		pangox.pc.in		pangoxft.pc.in		pangoft2.pc.in		TODO.xml		README.win32
+ EXTRA_DIST =  	pango.spec.in		pango.pc.in		pangox.pc.in		pangoxft.pc.in		pangoft2.pc.in		pango-uninstalled.pc.in			pangox-uninstalled.pc.in		pangoxft-uninstalled.pc.in		pangoft2-uninstalled.pc.in		TODO.xml		README.win32
  
diff --git a/x11-toolkits/pango/files/patch-configure b/x11-toolkits/pango/files/patch-configure
new file mode 100644
index 000000000000..807ac4dd9126
--- /dev/null
+++ b/x11-toolkits/pango/files/patch-configure
@@ -0,0 +1,20 @@
+
+$FreeBSD$
+
+--- configure	2001/08/01 16:52:43	1.1
++++ configure	2001/08/01 16:52:52
+@@ -7671,10 +7671,10 @@
+ s%@INSTALL_DATA@%$INSTALL_DATA%g
+ s%@PACKAGE@%$PACKAGE%g
+ s%@VERSION@%$VERSION%g
+-s%@ACLOCAL@%$ACLOCAL%g
+-s%@AUTOCONF@%$AUTOCONF%g
+-s%@AUTOMAKE@%$AUTOMAKE%g
+-s%@AUTOHEADER@%$AUTOHEADER%g
++s%@ACLOCAL@%/usr/bin/true%g
++s%@AUTOCONF@%/usr/bin/true%g
++s%@AUTOMAKE@%/usr/bin/true%g
++s%@AUTOHEADER@%/usr/bin/true%g
+ s%@MAKEINFO@%$MAKEINFO%g
+ s%@SET_MAKE@%$SET_MAKE%g
+ s%@CC@%$CC%g
diff --git a/x11-toolkits/pango/files/patch-ltmain.sh b/x11-toolkits/pango/files/patch-ltmain.sh
new file mode 100644
index 000000000000..0c594216b0e1
--- /dev/null
+++ b/x11-toolkits/pango/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/07/23 09:45:58	1.1
++++ ltmain.sh	2001/07/23 09:46:28
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index d2b3eab583a2..1bba67739b20 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -34,20 +34,35 @@ lib/libpangox.so.0
 %%XFREE4:%%lib/libpangoxft.a
 %%XFREE4:%%lib/libpangoxft.so
 %%XFREE4:%%lib/libpangoxft.so.0
+lib/pango/modules/pango-arabic-x.a
 lib/pango/modules/pango-arabic-x.so
+%%XFREE4:%%lib/pango/modules/pango-arabic-xft.a
 %%XFREE4:%%lib/pango/modules/pango-arabic-xft.so
+lib/pango/modules/pango-basic-ft2.a
 lib/pango/modules/pango-basic-ft2.so
+lib/pango/modules/pango-basic-x.a
 lib/pango/modules/pango-basic-x.so
+%%XFREE4:%%lib/pango/modules/pango-basic-xft.a
 %%XFREE4:%%lib/pango/modules/pango-basic-xft.so
+lib/pango/modules/pango-bengali-x.a
 lib/pango/modules/pango-bengali-x.so
+lib/pango/modules/pango-devanagari-x.a
 lib/pango/modules/pango-devanagari-x.so
+lib/pango/modules/pango-gujarati-x.a
 lib/pango/modules/pango-gujarati-x.so
+lib/pango/modules/pango-gurmukhi-x.a
 lib/pango/modules/pango-gurmukhi-x.so
+lib/pango/modules/pango-hangul-x.a
 lib/pango/modules/pango-hangul-x.so
+lib/pango/modules/pango-hebrew-x.a
 lib/pango/modules/pango-hebrew-x.so
+lib/pango/modules/pango-myanmar-x.a
 lib/pango/modules/pango-myanmar-x.so
+lib/pango/modules/pango-tamil-x.a
 lib/pango/modules/pango-tamil-x.so
+%%XFREE4:%%lib/pango/modules/pango-tamil-xft.a
 %%XFREE4:%%lib/pango/modules/pango-tamil-xft.so
+lib/pango/modules/pango-thai-x.a
 lib/pango/modules/pango-thai-x.so
 libdata/pkgconfig/pango.pc
 libdata/pkgconfig/pangoft2.pc