- Update to 0.24 - the version shipped with the GNOME2 alpha 2;

- swhich to .bz2 distfile;
- move distfile into gnome2 DIST_SUBDIR.

4 files changed, 31 insertions, 23 deletions

diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index bb50074d4ec2..7b47637372e0 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -6,21 +6,24 @@
 #
 
 PORTNAME=	pango
-PORTVERSION=	0.23
+PORTVERSION=	0.24
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/v1.3/ \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-alpha2,} \
+		ftp://ftp.gtk.org/pub/gtk/v1.3/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.3/ \
 		http://www.ameth.org/gimp/gtk/v1.3/
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig \
 		freetype-config:${PORTSDIR}/print/freetype2	# XXX
-LIB_DEPENDS=	glib-1.3.12:${PORTSDIR}/devel/glib13 \
+LIB_DEPENDS=	glib-1.3.13:${PORTSDIR}/devel/glib13 \
 		freetype.8:${PORTSDIR}/print/freetype2 \
 		intl.1:${PORTSDIR}/devel/gettext
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index 9bf19297a6f3..2b6c4dea9d01 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1 +1 @@
-MD5 (pango-0.23.tar.gz) = e2abd54433f47b2ffb1f698ccd4b3549
+MD5 (gnome2/pango-0.24.tar.bz2) = 468d2973cf38705c85459ee495bfb11b
diff --git a/x11-toolkits/pango/files/patch-ltmain.sh b/x11-toolkits/pango/files/patch-ltmain.sh
index 98cb05e4ddb3..91713d2306f8 100644
--- a/x11-toolkits/pango/files/patch-ltmain.sh
+++ b/x11-toolkits/pango/files/patch-ltmain.sh
@@ -1,9 +1,26 @@
 
 $FreeBSD$
 
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
+--- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
++++ ltmain.sh	Sun Feb  3 01:44:17 2002
+@@ -1037,8 +1037,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++	compile_command="$compile_command -pthread"
++	finalize_command="$finalize_command -pthread"
++	compiler_flags="$compiler_flags -pthread"
++	continue
++	;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -2412,6 +2420,9 @@
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
@@ -13,7 +30,7 @@ $FreeBSD$
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
  	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
+@@ -4179,10 +4190,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index 2625508af200..46b9f15db761 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -35,35 +35,23 @@ 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-ft2.so
 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-ft2.so
 lib/pango/modules/pango-hebrew-x.so
-lib/pango/modules/pango-myanmar-x.a
+%%XFREE4:%%lib/pango/modules/pango-hebrew-xft.so
 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